Issue #FUN-1 is fixed