Bugfix, from Kshiij's mac