Bugfix by scotdalton