FINALLY fix #3157

I know, this should have been done a LONG time ago