Probably will totally fix issue #16