Issue 397 reverting changes