Fixes #14 Apply Jb quick fix