MODIFIED: small bugfix