Fix for #274

As mentioned in #274, this is my workaround