Sprint task - fix for http://eclip.se/432412