Little change to fix #439 I think