Fixes 20130703