Should fix issue 43 along with fill branch of lib