Issue No.9 tempfix

Commented two lines of code which were causing issues related to issue
No.9. Needs investigating.