Fixed monster of a bug