fix #36 take 2