Pull in changes from https://github.com/lblasc/fbsub/commit/3c6631d5832dabd6479b341f77038851b50e855f