solution for Issue 389