Fixed some more bugs which made Isseu #90 unstable