This should solve some problems