should fix #250. CNR afterwords...