Fixes 20130603