implement/fix #51