fixed #132, #133