Fix for nesting issue