fix loading
sync with Context from 2013-04-17