Absoulutely. This is just a short term solution, I didn't want to make this PR any bigger and risk adding bad features.