Actually fixed bug this time.