Fix #1043 post 2