Fix for Issue#182