Re-applied code from v0.1.6.