A small bugfix + a small feature addition