More strict! Closes #14.