Nasty hack #2

Still thanks to @simonsickle