fixed #36 properly