Implementing fix

I think the fix from previous commit worked. 

http://www.youtube.com/watch?v=-W6as8oVcuM