Fixed error caused by last-minute refactor :-/