Fixed problem by change 47