#488 Small bugfix
#488 Another small bugfix