fixes #367

leaning how this forking merge request stuff works