Fix for Issue#55