Not really sure we should be doing this, relating to #1118 and #1117 ... Dunno really