Bugfix + extra stuff, do whatever you want with it #remix