Changed the fix for issue #25