Added workaround for #51