Try be more specific with quantities. Closes #1