Hopefully fixing this bug once and for all