Forgot the relevant changes for last commit ;)