fixed bug!