Temporary fix as per discussed in #27. The right way to do it. Instead of relying on a fork