Patch 1: Fixed issue 22

:+1: :-1: