[BUGFIX] Fixes bug in last commit