Expertmode fix