Hopefully fixes Giacom's complaints