Fix for Issue37