Possibly issue fixed #15