Proper Fix for #992
Fix for #1009