Fixed Unfixing - Fixes #19
Fixed Unfixing - Fixes #19