#FUN-1 and #FUN-2 fixed