goldyfruit [reboot] Fix issue #4