Fix for error in boundary