Closes #280, #281