This feature was originally reported in #257 and got fixed in 3a2dab59743e8d193a80ddb1aa1932e1b5462322, however it seems this got lost during development. Closes #661 Ref #257