Lets fix the other part of #1157