Fixes master