Added workaround for #1527