Change order to Fix #265 again
Possibly Fix Issue #269