Restored previous version
Fix for #308