Fix for Issue#276