ROCker: Major bug introduced in last commit fixed