Fix #419 Issue