Really Resolve Issue 392