This comment worries me - we should check for nil..