PATCH-FIX 0.6.1BETA