bugfix for cucumber, more coverage