Might this fix this stupid bug ??!