BUG FIX: Exception workaround