Fixed bug from 308