Another freakin bugfix