Added code that was missing in last commit