FUN-12

Issue is fixed, please review