Github Merge Fix #2

- It's not my day today!