Bugfix for new sample parent