issue 314? (now workable)