Proper block handling