Still hunting bug due to refactor ... (!!)