Fixed the blocks, hopefully there are no crashes anymore :)