Removing nested handler bugfix