Sort of fixed a bug