Attempt 2 at GBKReader commit