quick fix for [#14]