Fixes GH-1 and GH-2