fork issue fixed