Should fix #12, must be tested though.