Quick fix for bounds calculation