Supposedly fix #17, change convenience func