major bug fix possibly...