Fix for Vjeko's changes