Adding fix to forked repo