Fixed, but should cleanup the code.