Implementing fixes request from 2013-09-04