Bugfix/bastard is bad