temp fix to crazy bug