Fix #530 and #531