Previous implementation didn't work on GH pages