Fixes ticket:372