Added workaround to #155