fixes #489

you can haz you bukkit
Merge pull request #495 from way2muchnoise/master

fixes #489