[#228] Fixes #228 with final copy