#1 fix master creation