Try to fix strange bugs