Temporary fix as per discussed in #27