fixed #544