slamm changes, bug found while testing