Fix for ticket # 3644

sorry for 2 files, pushed it up befor ei took out the comment. This will fix the above ticket issue.