Fixes 20130604