Fix for parent bug