Fix for changning cells