Fixed major outstanding issue with current version