changed method
no more hack