Revert "Revert "Properly Fix #301""

This reverts commit aba04518cbd368d3b29cdf5e1715c51038a3616e.