Fix #496. Hopefully, Please test @Erikvv