Issue #1: Fixed type caused by merge.