Smaller bug fix