Fix for running master