fix really nasty bug (by adding "else")