Github issue fix. 6