re-added Bart39's last commit