This is the stupidest shit ever - this has to be fixed