Fix master

@adamggg revert wrong merge by @adamggg