Bug Fix No2

I should definetly do some more checking on some things ...