Wip fix master

@jcsp