#122 Fixed js