Catchall bugfix