fix for a bug reported by viniciusmaxdaloop@gmail.com and few related patches