Attempt to fix stefanovic's bug