Attempt bug fix
Please work!