Properly Fix #301