BUGFIX: explicit code is often better...