It might be that this fix should wait for another PR though since it will implicate the I/O library a bit I guess.