Merge Fix #1

My bad
Merge Fix #2

This might happen more often in the future I fear...