Fix for #308
Restored previous version
Fix #308