bugfix and less confusing naming