Implements Issue 158