Added back in panic
Merge pull request #282 from GBGamer/master

Fix a problem with last pull request