Removed workaround, hahaha :/