Debug bug unbugged :) Closes #210