#58 issue fix