hot fix for LUGG-205