Rollback of previous commit; minor fix