fixed broken callbacks