[PATCH 3/3] Bugfix