Fix #526 issue