Bugfix, Friday morning... getting tired...